Cosmetics

Pango lets us pass NULL for the font desc and language
in pango_context_get_font_metrics() to use the context
values.

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 915eacbe607ceb0090f40e557b5e892e0b1faa45..abe5694c71aa8fdff48e64e91086e79c1c377ab3 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1091,9 +1091,7 @@ gtk_image_get_baseline_align (GtkImage *image)
   if (image->baseline_align == 0.0)
     {
       pango_context = gtk_widget_get_pango_context (GTK_WIDGET (image));
-      metrics = pango_context_get_metrics (pango_context,
-                                          pango_context_get_font_description (pango_context),
-                                          pango_context_get_language (pango_context));
+      metrics = pango_context_get_metrics (pango_context, NULL, NULL);
       image->baseline_align =
                 (float)pango_font_metrics_get_ascent (metrics) /
                 (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics));

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 09e167dd4e33bbc74272cf8bb616b1f00e25b888..10d65667e920c0dd457f5e0ca8c376a6e56924d3 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1039,14 +1039,12 @@ get_char_pixels (GtkWidget   *self,
   int char_width, digit_width;
 
   context = pango_layout_get_context (layout);
-  metrics = pango_context_get_metrics (context,
-                                       pango_context_get_font_description (context),
-                                       pango_context_get_language (context));
+  metrics = pango_context_get_metrics (context, NULL, NULL);
   char_width = pango_font_metrics_get_approximate_char_width (metrics);
   digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
   pango_font_metrics_unref (metrics);
 
-  return MAX (char_width, digit_width);;
+  return MAX (char_width, digit_width);
 }
 
 static void